From 7db39317b120a246f6607e92e0db55aef9117bfd Mon Sep 17 00:00:00 2001 From: Jason Ozias Date: Fri, 31 Oct 2014 23:50:29 -0400 Subject: [PATCH] updated to work with DSTify Hash commit in rust --- src/cargo/core/registry.rs | 4 ++-- src/cargo/core/resolver/mod.rs | 10 +++++----- src/cargo/core/summary.rs | 4 ++-- src/cargo/ops/cargo_compile.rs | 10 +++++----- src/cargo/ops/cargo_new.rs | 8 ++++---- src/cargo/ops/registry.rs | 10 +++++----- src/cargo/ops/resolve.rs | 2 +- src/cargo/sources/registry.rs | 6 +++--- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index ad32d1448..7f1e6dab0 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -213,7 +213,7 @@ impl<'a> PackageRegistry<'a> { // map a dependency though, we just pass it on through. fn lock(&self, summary: Summary) -> Summary { let pair = self.locked.find(summary.get_source_id()).and_then(|map| { - map.find_equiv(&summary.get_name()) + map.find_equiv(summary.get_name()) }).and_then(|vec| { vec.iter().find(|&&(ref id, _)| id == summary.get_package_id()) }); @@ -242,7 +242,7 @@ impl<'a> PackageRegistry<'a> { // on. None => { let v = self.locked.find(dep.get_source_id()).and_then(|map| { - map.find_equiv(&dep.get_name()) + map.find_equiv(dep.get_name()) }).and_then(|vec| { vec.iter().find(|&&(ref id, _)| dep.matches_id(id)) }); diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index 5931df8c7..462f44927 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -373,10 +373,10 @@ fn resolve_features<'a>(cx: &mut Context, parent: &'a Summary, // features that correspond to optional dependencies for dep in deps { // weed out optional dependencies, but not those required - if dep.is_optional() && !feature_deps.contains_key_equiv(&dep.get_name()) { + if dep.is_optional() && !feature_deps.contains_key_equiv(dep.get_name()) { continue } - let mut base = feature_deps.pop_equiv(&dep.get_name()) + let mut base = feature_deps.pop_equiv(dep.get_name()) .unwrap_or(Vec::new()); for feature in dep.get_features().iter() { base.push(feature.clone()); @@ -446,8 +446,8 @@ fn build_features(s: &Summary, method: ResolveMethod) } match method { ResolveEverything | ResolveRequired(_, _, true, _) => { - if s.get_features().find_equiv(&"default").is_some() && - !visited.contains_equiv(&"default") { + if s.get_features().find_equiv("default").is_some() && + !visited.contains_equiv("default") { try!(add_feature(s, "default", &mut deps, &mut used, &mut visited)); } @@ -485,7 +485,7 @@ fn build_features(s: &Summary, method: ResolveMethod) feat))) } used.insert(feat.to_string()); - match s.get_features().find_equiv(&feat) { + match s.get_features().find_equiv(feat) { Some(recursive) => { for f in recursive.iter() { try!(add_feature(s, f.as_slice(), deps, used, diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs index 12737fc6d..221256948 100644 --- a/src/cargo/core/summary.rs +++ b/src/cargo/core/summary.rs @@ -22,7 +22,7 @@ impl Summary { dependencies: Vec, features: HashMap>) -> CargoResult { for dep in dependencies.iter() { - if features.find_equiv(&dep.get_name()).is_some() { + if features.find_equiv(dep.get_name()).is_some() { return Err(human(format!("Features and dependencies cannot have \ the same name: `{}`", dep.get_name()))) } @@ -37,7 +37,7 @@ impl Summary { let mut parts = dep.as_slice().splitn(1, '/'); let dep = parts.next().unwrap(); let is_reexport = parts.next().is_some(); - if !is_reexport && features.find_equiv(&dep).is_some() { continue } + if !is_reexport && features.find_equiv(dep).is_some() { continue } match dependencies.iter().find(|d| d.get_name() == dep) { Some(d) => { if d.is_optional() || is_reexport { continue } diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index 18ed9328d..6d7568f70 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -154,7 +154,7 @@ fn source_ids_from_config(configs: &HashMap, cur_path: Path) -> CargoResult> { debug!("loaded config; configs={}", configs); - let config_paths = match configs.find_equiv(&"paths") { + let config_paths = match configs.find_equiv("paths") { Some(cfg) => cfg, None => return Ok(Vec::new()) }; @@ -177,7 +177,7 @@ fn source_ids_from_config(configs: &HashMap, fn scrape_target_config(config: &mut Config, configs: &HashMap) -> CargoResult<()> { - let target = match configs.find_equiv(&"target") { + let target = match configs.find_equiv("target") { None => return Ok(()), Some(target) => try!(target.table().chain_error(|| { internal("invalid configuration for the key `target`") @@ -185,7 +185,7 @@ fn scrape_target_config(config: &mut Config, }; let target = match config.target() { None => target, - Some(triple) => match target.find_equiv(&triple) { + Some(triple) => match target.find_equiv(triple) { None => return Ok(()), Some(target) => try!(target.table().chain_error(|| { internal(format!("invalid configuration for the key \ @@ -194,7 +194,7 @@ fn scrape_target_config(config: &mut Config, }, }; - match target.find_equiv(&"ar") { + match target.find_equiv("ar") { None => {} Some(ar) => { config.set_ar(try!(ar.string().chain_error(|| { @@ -203,7 +203,7 @@ fn scrape_target_config(config: &mut Config, } } - match target.find_equiv(&"linker") { + match target.find_equiv("linker") { None => {} Some(linker) => { config.set_linker(try!(linker.string().chain_error(|| { diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs index 1fc5ab7d0..e3eda8999 100644 --- a/src/cargo/ops/cargo_new.rs +++ b/src/cargo/ops/cargo_new.rs @@ -136,13 +136,13 @@ fn global_config() -> CargoResult { email: None, git: None, }; - let cargo_new = match user_configs.find_equiv(&"cargo-new") { + let cargo_new = match user_configs.find_equiv("cargo-new") { None => return Ok(cfg), Some(target) => try!(target.table().chain_error(|| { internal("invalid configuration for the key `cargo-new`") })), }; - cfg.name = match cargo_new.find_equiv(&"name") { + cfg.name = match cargo_new.find_equiv("name") { None => None, Some(name) => { Some(try!(name.string().chain_error(|| { @@ -150,7 +150,7 @@ fn global_config() -> CargoResult { })).ref0().to_string()) } }; - cfg.email = match cargo_new.find_equiv(&"email") { + cfg.email = match cargo_new.find_equiv("email") { None => None, Some(email) => { Some(try!(email.string().chain_error(|| { @@ -158,7 +158,7 @@ fn global_config() -> CargoResult { })).ref0().to_string()) } }; - cfg.git = match cargo_new.find_equiv(&"git") { + cfg.git = match cargo_new.find_equiv("git") { None => None, Some(git) => { Some(try!(git.boolean().chain_error(|| { diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs index 9ffef7581..728c34eaa 100644 --- a/src/cargo/ops/registry.rs +++ b/src/cargo/ops/registry.rs @@ -109,13 +109,13 @@ fn transmit(pkg: &Package, tarball: &Path, registry: &mut Registry) pub fn registry_configuration() -> CargoResult { let configs = try!(config::all_configs(os::getcwd())); - let registry = match configs.find_equiv(&"registry") { + let registry = match configs.find_equiv("registry") { None => return Ok(RegistryConfig { index: None, token: None }), Some(registry) => try!(registry.table().chain_error(|| { internal("invalid configuration for the key `registry`") })), }; - let index = match registry.find_equiv(&"index") { + let index = match registry.find_equiv("index") { None => None, Some(index) => { Some(try!(index.string().chain_error(|| { @@ -123,7 +123,7 @@ pub fn registry_configuration() -> CargoResult { })).ref0().to_string()) } }; - let token = match registry.find_equiv(&"token") { + let token = match registry.find_equiv("token") { None => None, Some(token) => { Some(try!(token.string().chain_error(|| { @@ -174,12 +174,12 @@ pub fn http_handle() -> CargoResult { /// HTTP_PROXY env var. pub fn http_proxy() -> CargoResult> { let configs = try!(config::all_configs(os::getcwd())); - match configs.find_equiv(&"http") { + match configs.find_equiv("http") { Some(http) => { let http = try!(http.table().chain_error(|| { internal("invalid configuration for the key `http`") })); - match http.find_equiv(&"proxy") { + match http.find_equiv("proxy") { Some(proxy) => { return Ok(Some(try!(proxy.string().chain_error(|| { internal("invalid configuration for key `http.proxy`") diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs index 70c2c1dfa..9b73e663b 100644 --- a/src/cargo/ops/resolve.rs +++ b/src/cargo/ops/resolve.rs @@ -96,7 +96,7 @@ pub fn resolve_with_previous<'a>(registry: &mut PackageRegistry, (d.get_name(), d) }).collect::>(); summary.map_dependencies(|d| { - match map.find_equiv(&d.get_name()) { + match map.find_equiv(d.get_name()) { Some(&lock) if d.matches_id(lock) => d.lock_to(lock), _ => d, } diff --git a/src/cargo/sources/registry.rs b/src/cargo/sources/registry.rs index a112f4e7b..01d0a804f 100644 --- a/src/cargo/sources/registry.rs +++ b/src/cargo/sources/registry.rs @@ -357,8 +357,8 @@ impl<'a, 'b> RegistrySource<'a, 'b> { /// Parse the on-disk metadata for the package provided fn summaries(&mut self, name: &str) -> CargoResult<&Vec<(Summary, bool)>> { - if self.cache.contains_key_equiv(&name) { - return Ok(self.cache.find_equiv(&name).unwrap()); + if self.cache.contains_key_equiv(name) { + return Ok(self.cache.find_equiv(name).unwrap()); } // see module comment for why this is structured the way it is let path = self.checkout_path.clone(); @@ -385,7 +385,7 @@ impl<'a, 'b> RegistrySource<'a, 'b> { Err(..) => Vec::new(), }; self.cache.insert(name.to_string(), summaries); - Ok(self.cache.find_equiv(&name).unwrap()) + Ok(self.cache.find_equiv(name).unwrap()) } /// Parse a line from the registry's index file into a Summary for a -- 2.30.2